<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
    <style>
        *{
            margin: 0 auto;
            padding: 0;
        }
        div{
            width: 100px;
            height: 100px;
            background-color: #fff;
        }
    </style>
</head>
<body>
<!-- <<<<<<< HEAD -->
    <div>
        hahahahahahahhaah
    </div>
    <div>
        hahahahahahahhaah
    </div>
<!-- ======= -->
    <!-- 第二次握手 -->
    <div></div>
<!-- >>>>>>> e102446a851595b379be27d31bb22c124bc79173 -->
</body>
</html>